The code deduplication gods smile upon our refactory efforts.

Continued exploiting the fact that all of the various language stages
are 80% the same.  Our knights will not rest until all duplicate code
has been banished from the kingdom.