Now commands can be of the form \begin... or \end... This should solve problems like #24.