! Consistency is nice.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! Using the options available to us and fixing something that got missed.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! Something that got broken.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! Unbreak something else.
! And another thing that was broken.

Signed-off-by: Peter Spicer <sleeping@myperch.org>