Begun resolving #22.