Improve {@option} tag handling.