Minor regex cleanup now that I'm only using a single one.