Restore support for $key as map-remove keyword arg

Signed-off-by: Alex Coles <alex@alexbcoles.com>