[PATCH 2/6] Fix up code to conform to 80 columns where possible.