minor refactor - better use of EmptyStatement.INSTANCE
Merge branch 'master' into rlw-jdk8