Simplified case logic, simplified parsing logic, added -O(nly) flag