#25: Parsing terminatur aliases more efficiently