I've addressed this in a few new commits on the branch.