CRM-11612 - Fix references to global "$"