Changes for #364.