Cleanup

Don't propagate $type unnecessarily.

Created by  Eelco Dolstra  on December 4, 2011
2WRTOU2Z2R3MWLRZCKK3ZZ2C5LJBH6GNJT77NETVA22Y23DUIX5QC
Change contents