Minor code-style fixes in AbstractGuy