Do not use pure theory terms as single triggers.  Minor cleanup.