Refine Group/GroupField, Refactor FixMessageEncoder, minor code cleanup