Quick hack for automatically indenting guards
Merge branch 'indentkeys'