#14: Space between "boundary" should be optional.
cleanup regex a bit