Work on #590.