Improve the kernel autobump tracking code