Store the expanded locators on the page.

STUD-2038

@dan-f and @benmcmorran Please code review and manually test.