Fix build on older GCC. Add a few TODO items.