Prototype of fix for builder properties.

No actual T4 changes made. Just hacked at its output.