Merge "Clean up some IDatabase comments"