Following commit c5744340. Additionally removes the need for a second 'result code' variable as well.
