Keep the original getter return type if the new command-line options haven't been used, to avoid regressions.