Remove intermediate variables

These were to leave the core rendering function unmodified while adding the
multi-repo functionality. Using the full name makes the source of the value
clearer as well.

Also update comment on limitMessageTo with 0 as a special case.
Whitespace