mid-state: cleaning up ambiguous symbols