Yep, good suggestion. New commit to come.