Use a couple of macros instead of magic constants