undo some Romain-isms (#207)