Fix bug with incremental+datatypes.  Minor cleanup.  Disable regression bug484, enable parsing_ringer.