Removal of duplicit enumeration and unnecessary conditions.