Isn't it neat when one TODO simplifies another? :)