Some USFM marker restructuring and improved index checking and handling