Fixing retro tabs-spaces nightmare

Also cleaned up at least one really dumb boolean method.