Starting to figure out construction of ServiceBuilder, Container, and Tracker.
Minor clean up.