Move static and final attributes around.

Fixes some odd behaviour with FindBugs preliminary bug detection plugin.