added attempt at thin-wall return if appropriate