simplify compiler filtering in bear
cosmetic changes