This is mostly all automatic from clazy, though it got confused by a few
namespace issues.