Though it doesn't appear here I've addressed this in 9a5c0ee.