Rearrange some EC stuff to be bound to the right ifdefs. fixes #900
Merge pull request #905 from reaperhulk/fix-900

Rearrange some EC stuff to be bound to the right ifdefs. fixes #900