getopt major style fix, remove macro-mania with nicer typed functions