@Ocramius - Yea, It's late and I'm loosing my marbles.  Should be easy enough.  I really like the idea of moving these out the service locator.  Just looking at the code it looks like it belongs there anyway.  

I'll take a stab at this tomorrow.  For now, I'll close this PR and start over using this feedback.  Thanks for looking this over.