PHP 5.0+ fixes.

$this doesn't need reference passing anymore.