e2b6ff7a6c
Reducing diff noise so I can see important changes easier when comparing branches. A few API changes, but nothing that affects functionality.