Effectively revert cfa9256, issue #242.

The widening appears to break Verilog synthesis.