Modify the origin definitions for efficiency.