Doesn't this one need the same sort of treatment to handle the change in argument order?