@cbroglie, @mcheung610 

This should be safe now. What really needs to happen is that all these #ifdefs need to go away.