Add properties and removed '> >'s (as C++11 has removed this idiosyncracy).