Exactly so. What makes it a little confusing is that untrained skills are the only non-proficient stat that's likely to end up on a character sheet (since most characters will only use weapons and armor they're proficient in). For every other stat you're ever going to refer to, you'll be getting (Level)+2+Modifier+Misc at a minimum. Only untrained skills are ever going to be rolled with Modifier+Misc.
I will say, it's understandable for people to miss this. Proficiency is presented really sloppily - the equation should really be a cutout in bold somewhere, considering how important it is. Instead it's explained in natural language in the second half of an unmarked paragraph on page 10. If you're skimming, you might miss it entirely.