Use Perinci::Sub::Normalize and simplify code