Small step toward call-conv improvement: separate out calls and returns