Style cleanup and reënabled local fixtures on this branch.