Merge "clean up User::getOptions a bit"