Tweaked constructors.