Parser_expression: move special case {} forward (was useless)
Makefile cleanup and some renaming in uncommited files.