the "NULL" icon removed (now it can be empty); minor parsing improvements