Adapted to Magnum changes.

This waited until I renamed everything to get rid of <>. Twice. Now it
looks better (although longer) as there are no <3, T> anymore.