Minor loading changes in prevision of refactoring the way this gem is loaded