More work for #22.