Changed fsm_expand to merge multiplexers more aggressively