Preparatory changes for version 2.