undo crazy parameter line wrap introduced by IDE.
Improve line wraps.
Fix inconsistent return points
More line wrap improvements.
More line wrap improvements.