Better variable names, comments, add a default parameter
Handle the case where the next paragraph marker we are searching for is also a subparagraph marker