Update to cope with changes in registers.h