Add #ifdefs to elide servo code