More preparations for #32.