Quantum Oscillations of Electrons and of Composite Fermions in Two Dimensions: Beyond the Luttinger Expansion