WYRL: ok, the rewrite complexity is now starting to do something vaguely useful.
WYRL: ok, some minor tweaks.