BUG-6867: simplify definitions with static imports