Closure and fix dot pair parser bug.