more robust semicolon-handling. Should fix #22