As a heads-up, this stuff is gone in my latest PR.