macroexpand-1 impl cleanup
change maybe-class caching level
remove calls to maybe-class in prim-invoke
fix test