LISP GPE: initial CP commit and DP improvements