Remove some hardcoded assumptions.
Change the order.