Added extra bootstrap semantics.