Small improvements to the parser with tick-numbers.