Fixes #140 Note: this is an evolution but the end result needs to be different. See cantfit.py for some good examples on bad formatting caused by this change.
