Reverted nextmethod optimization, as the branch it is in seems to be (dead?) cold.