some more cleanups related to #285