Pickup upstream changes (refactoring) for the procedures stolen from the 'getEagle.tcl' script file.