Yes, unfortunately the ugliness also permeates the BlockManager* realm. We must stop it before it's too late.