Preparations for issue #19.