Fixing up TODO comments.