Rolled back to revision 1.403 and incorporated changes proposed without the ?Construct class change. Fixed some whitespace issues for cosmetic purposes.