Refactored code to use internal constructors to set fields rather than DoAlign methods.
Authored by: delphidabbler 2011-06-12
Parent: [r1483]
Child: [r1485]
