1.0.21.9: refactor toplevel option processing somewhat