Some slight style changes and fixing something broken in the last
commit.