Cleaned up ConstructorMagic logic (use initialValue()).