TODO cleanups based on @havocp's comments.