VP-297: Switch all to demands-based relay. Tests updated and passing. Code still needs clean-up.