testplan: merge in changes from my picolisp implementation.