fix refs before keywords, `isa` macro