I made a few (hopefully inoffensive) changes to accomodate the enforced styling. What do people think? Assuming this series is OK, do you want mega patches (~500 line diff) or more small patches for semi-auto styling?