WYRL: a couple of relatively minor bug fixes to SimplerRewriter.