Removes dependency on #define