Modifying org sensor arg passing for (potential) speed improvements.