avoid accidental globals caught by @tcr in review