Fix some issues with terminatur alias parsing