Port away from Simple{Cursor,Range}
custom-definesandincludes: Port CMake code