Added make_deletable and the like to appease our g++ 4.7.2 gnu++11 overlords.