'offset', 'depth', 'distance', and 'within' support (Cleanup);