Fix warnings and remove IM_RETURN (4470)

Amend f24abbc4
1 file changed