Support both array and variable arg key syntax, #485