Buck futurize

@ArnaudBrousseau 

This includes my other PR. Not too sure how to deal with that.