Could you either do this or remove the TODO?  I'm happy either way.