Tweak method naming, cover edge cases.