Senate has its way with House ethics bill