Added missing final modifiers

Tried to restore as many final modifiers as possible. 
I suppose we do, and per JLS, the proper ordering is "private static final X".