Merge RawStatus and Status classes.
Fix bogus warning message when applying changes.