Improve support for overridable manual transitions.