Don't try to tag empty fields
Fix accountType Enum
Fix wire type for stausCode in MercuryRepy

This can't really be the final fix