I'll roll this into a helper after this patch so that I can move the other instances to the helper without muddling things up.