More restructuring for #35.