Code cleanup and fixes for missing empty constructors required for JSON deserialization.