s/l/length
A few more length variables.
Merge pull request #1226 from braddunbar/length

A few more length variables.