Properly fix exporting of classes into Base.exports.
Minor code clean ups.