Fix up register list and start building struct.