Changes for #434.