Moves visibility statement out of the query.
Authored by: jplang 2009-02-28
Parent: [r2537]
Child: [r2539]
