Fix mapping bug with blocks with many arguments