repeat cleanup steps from PR #1091 to latest code. As @dlebauer notes, at this point that will be easier than resolving conflicts.
