Eliminated GroupBy::TaggableWithContext module, merged it into regular TaggableWithContext