a84ecf3919
Without actually consolidating the two backends this patch brings their code within a cats whisker of each other in preparation for consolidation.