Some tweaks relevant to #17.