Addressing #123

. . . and fixed an inefficiency I saw.