Greatly improved (fixed?) linearization order