We should, but this PR is just to fix a bug.  We should have a different PR for refactoring. :)