C++11 refactor: SEVERE BUGS, please use previous revision