More spring config refinement.