Update to Manifest V2.
Short-circuit faster.