Onsets don't rely on magic constants now