Normalize naming and reference conventions.

 * Don't use 'this' when it's not needed.
 * Local Segment references are 's'.

Noticed this when poking around. This matches the majority of the rest of this file.