Patterns: shorten defpat args, fix bugs