rewrote atomic parser code, now expand to top-level defn's