Fixed taps to coincide with CHDL updates.