Fixing up multiple return paths from code review.