More insubstantial refactors and loads of small crap.