Fixed unwatch()
Added 'nonempty' option for mixin helper.
Fixed specs for new 'nonempty' option.
Fixed header parsing.