Make some fields static

A field may be static if it is declared final, and is initialized with a
constant
Merge pull request #495 from naoliv/pull21

Make some fields static