This series includes mostly no-functional-changes to simplify or cleanup various routines. Patch #11 includes an fix to functional behaviour.