Ensure we don't splice keyword args unecessarily, closes #989