Some changes for clint.py
Use enums for arguments listings, not incremental defines