8390cfe8a6
Clean up return path of each function to have a single exit point. This reduces diffs against the MPSAFE tree.