Done and pushed; this code use to have more "magic" and I was calling that out, it's not really so magic-y now.