fix remaining survivors of the return(a) cleanup
4 files changed