Good discussion to have. If it's cool, I'd like for any related refactor to happen in a later release.