Added lexical scopes for visibility specifiers