swr/rast: code cleanup (no functional change)