I created a bug to track refactoring for those.