avoid problems with const NilValue in compiler
Merge branch '21-scalars' into 22