Fix simplification thinko; Mouq++; closes #1