Fixed instruction timing at most places