Add implict KWICs; try to clean up the RX pipeline version