Further refinement/cleanup.