That makes sense. I still think @jlipps should review this before merging.