Nope, good catch.  This PR still needs some work, and is mainly here for review by Marco right now.