I think you're right about that, but I'm not objecting to his being a bit of a git; it's just that he seems to have changed in ways that confuse me. In 'Lazarus Rising' he had slightly archaic speech patterns and generally gave off an air of something not quite human, but in this episode I think that's disappeared. Which is a shame.