Heuristics on for .cl

Good point. We seem to have a bunch of `if...end` statements in here. They should probably be `if...elsif..elsif...`