Change empty_terms and empty_comments to keep_terms and keep_comments