Reorder define's

I like having the define's for abstracted function calls before those
for primitive values such as numbers.