Beginning transition to RAII-based call-stack manipulation