Remove exceptions, unnecessary
Only escape service names at start of string
Handle optional services
Better argument handling including mid-string arguments