Remove some unneeded brackets and make the remaining part of our parser code applicative