Enhanced to support @email{} as supported in texi2html in texinfo 4.0. This way we maintain compatibility but continue to use the better, more flexible tool.