fixes #6496 - Added :match helper method to saferender
fixes #6498 simplified eval statement