Correct multi-return inception handling + return code cleanup. Closes #449.