Cleaned up pattern handling of triggers and unbounded decimals.