Follow up on commit r190159. Also test the KFreeBSD i686 platform defines + minor cosmetics