Cleanup to make Item and Document more similar.