Dispatching a few more little TODOs.