Shift a TODO into the code where it belongs