Minor improvements related to the forced_return() function