Saner handling of case arguments