*: move getopt reset code to better place(s)

4 files changed