Cleanup for 0.11.13 WIP

Making a branch and PR here so everybody will have it easier keeping track of what is happening.

This currently compiles and tests pass on 0.10.26 and 0.11.13-pre.