Further adaptations to old source.hpp header.