We either want to not return ``self`` here of to return ``self`` in the other case too (I have a vague preference for the former).