OK I'm going to leave this as-is for now, but will consider making the change later.