In order to support alignment-only builds, no longer require annotation.