No real changes, just make the trivial ctors of this class inline for consistency with the new ctor about to be added.