Agree, I will do that. Do you prefer a separate commit, or should I try to force an amended version?