Changes to implement latest nightly build macro rules