Agreed. Fixed this and others in recent commit.