More regex fiddling...