Better handling of multiple caseforms