WIP: 102 pt code style rebase

Just trying to rebase master on top of this big style change is hard work! This is my attempt at rebasing it... not sure if it's correct yet...