Fix issues with trimming that was resulting in 'is' always being the default value. RE: #2288