Changed `super` into `$super`

`mergeProperties` now can merge functions that have access to the
original method via the static `$orig` object.