Replace the existing dictionary mechanism of OFEP1 with a version that uses "closures" to simplify syntax.