Nitpicks from Martin and others

https://trello.com/c/VZyC3GMx/144-martins-nitpicks
You should have eclipse generate one for you instead of suppressing the warning.