Actually fix #51, improve gist line numbers