Also, why did you change this from a splat?  It's unclear to me what the connection of this change is to the PR as a whole.