Clean up TODO/FIXME comments a bit