Clean up Marker adapting to issue #103.