cleanup code by reusing standalone_scaffolding
tests: add test to check if upcoming vectorization pass takes branches into account