Minor refactoring in Fresh macro annotation.