use more consistent input-output ordering for arguments of inline functions in D_psi