Better handling of `&' with no `;'.