Cast citext to test in 'select ... from'

Detecting the OID of citext "at startup" wasn't always quite early enough,
so the second option is to make sure no citexts are returned.

This reverts commit a0ddbe03a28868fdbe3f4f447af60c94e383896a.