Ampersand hunting

Converting naked ampersands to entities.