Convert a couple of redundant let* forms to regular let forms