Finishing switch to RAII-based call-stack manipulation