Ordering, constraining Take expressions, Fakes warning removal, cleanup