Re-enable support for "top-level field"; some support for cygwin; misc improvements