An incompatibility between #440 and #438 was not caught until after
merging both to the main branch.