Update to be consistent with continuing stan refactor