Cleanup

Prefer long options, if available.