Imported fix for annotations and external variables from sausalito