Make code generated by gen_hydrapacket.py cleaner. Still needs work