Tweaks.
Makes white space in fields work properly, including a test for regressions.