Minor refactorings
Merge branch 'master' of https://github.com/cRiMi/JSR-330.git