Simplify code block line numbers

This pretty much undoes ddf7c09. Check out that commit for motivation on
why it was that way.