Squished more bugs.  Systembuilder doctests pass!