More method ordering tweaking.