Oops, add support for standard and library variables.