A bit of cleanup and TODOs.