Minor cleanups.
read-current-company-info fixed.