Some minor refactoring.
Merge branch 'https-progresslistener' of https://github.com/ohtufox/isa into https-progresslistener
A minor bugfix.