Cosmetic adjustments and warning fixes
Parser: don't increment render_priv->state.bm_run_id (unnecessary)