chore(services): cleanup service provider and remove 5.2 support

This removes uses of create_function() and moves all SP factories inline and orders the declarations more cleanly (IMO).