cw2: Refactor sr logic to use multiplexer
cw2: Rename mux selector types
cw2: Minor alignment fix