Make pre-chorus parsing more flexible