Together with @mguth and @hartman I found some bugs in the RNN track ordering. I'm leaving this as WIP because I'd like them to confirm that this is better than before, but we should try to merge the changes soon.