Refactor #4125: Apply position getter/setter in samples