Cleaned up handling of VarDecls and Flags.