Agreed. (I had copied this from the previous version, which had them all as one method; you're right that it would be much clearer as two.)