Remove superfluous curly braces from match construct