Any thoughts on this TODO? (I'm pretty sure I was the one who wrote this; wasn't sure if we cared about this or not)