Tweak indentation for guards - not perfect, but  perhaps a bit better.