GPII-442:  Detect running solutions.

Whitespace cleanup and other tidying.