Better handling of SGML (<?...>) and XML (<?...?>) PI