Might consider changing `which` to be a symbol, which seems to be the direction we are going with parameters such as this?  Or does it matter?

I guess that change could be separate from this PR.