Fix overstate recursive call mapping references