remove a few more ifdef's in favor of a define