Removed optimisation that destroyed tab support.
Removed optimisation that destroyed tab support.

Also some other cleanup as a bonus.

antifuchs/mcclim,antifuchs/mcclim,onixie/mcclim,onixie/mcclim,swflint/McCLIM,onixie/mcclim,swflint/McCLIM,swflint/McCLIM,slyrus/mcclim,slyrus/mcclim