More ReturnStatement Tweaks