>In fact we are also investigating if we can develop a little utility to help or automate this process.

go fix?

Also, it seems like this is begging for a compiler optimization that will make this all obsolete...