Stop using `return` in inline callbacks