case macro now optimizes keyword case