The original code was done in a way that would be useful during
porting, but that would hinder future work unnecessarily.

Carlo