It is just stray, need to check better for these.
Also, I need to push the new testcases to this PR instead of the track_no one in #554 :)