Re-implementing Shaun's MazeMultiplier addition.

My previous commit accidentally undid his changes, this one fixes that.