Merge "Clean-ups in rdopt.c"