Clean up hooks...

... also renamed DimensionSwitch to DimensionSwitchHook ...