caps: use our macros more often in the code