Removed dependency on assimilate or aug.