Improve inside/around mark utility