WIP for issue #31.