Fix mixed return value handling... again