Preparation for #32.