Now also counting signature changes, though we're not yet sure if it's correct.