Fix generation of empty layer/style entries