minor refactor - better use of EmptyStatement.INSTANCE