Move trap reflection bits into their own header