- Got rid of a bunch of XFLG_* options.