Cleaned up safety/correctness divide