This improves some of the closing in the svc resource. This still needs lots of improvements, and it's sort of terrible because it was some very early code written.