improved and generalized definition of hidden/default values; cleanup