I previously mistakenly put these contributed types (THANK YOU MARK!) in the wrong place, this corrects that mistake.