Modifications to support dynamic vector dispatch.