Bootstrap improvements

 - Don't instantiate the CI singleton twice.
 - General clean-up.
 - Fix issue #953.
2 files changed