Clean up point matching for regexp and static