bump minor version
define noop LIKELY/UNLIKELY when lacking
refactor by inline
re-indent a little