Change the form of next instruction address logic to work around limitiations in Xilinx tools.