Handle more annotation values

Regexplosion!