Yet more code before tests :(

Unfortunately, interdependencies between expression types and variable specs
don't give a choice.