Up to types (now just Unit), check_procedure ok