Update to new ##cond-expand-features
Update to new display behavior for keywords
Patch around ##gensym-counter bug