Removed AST dependency on instructions
Various fixes