Updates to repeater / flex fields to remove large sub field array keys

Signed-off-by: Elliot Condon <e@elliotcondon.com>