I have at least 2 other in-progress PRs that add optional parameters to this and similar functions.  Should we consider a move to an options hash?  I'm not sure how much to care about the overall health of this client code.