You're right, my use of `ServiceLoader` is a little wacky. I'll get it fixed.