fix helpers for hash-based arguments