More changes and checks to accomodate bare Sampler objects