issues 2412 and 3665; preprocess rsolve input