Yeah, I actually did a rebase, and there were no conflicts. I want to
address your other comments so I'll have at least one more commit on the
branch.