Refactored out convenience typedefs