Any objection to merging this and then once I merge the other one in just doing a commit that reformats everything using the shared Eclipse formatter that we use with the server component?