Devel

This approach gets rid of the #ifdef's. Suggest waiting for Travis to confirm this is ok on 3.3 and 2.7 :-)