Make implementation supporting both GNU and BSD syntaxes (very early stages)