Disambiguate conditional by allowing prefixed. TODO: Cleanup commit.
Rebase into previous repeat changeset.