Minor code cleanup, see #138.