Update sessions to use sub-consents

Also in preparation for studies.