replace simple functions with defines
2 files changed