Cleaner encoding of argc/argv constraints (requires latest version of CBMC)