Incremental fox for #258.