Fix for M3: handle new --full argument passed to build script.
Fine tune.