DRY a bit, fix route logic for all state pairs