Refactor scene/demand interfaces.