Some minor regex tweaks