swr/rast: WIP builder rewrite (2)