Cleaning up the proxy property generation code.