Another alignment tweak and also consistent usage of double quotes for
strings.