c++ification and extension to two markers

Please move that back to the cpp