That certainly makes the code cleaner, and no, does not miss any cases.