Partial move to modularity; regresses compatability.