Remove some more PHP 5.3 $that artifacts