Adopt to new incremental modes (incomplete).