small tweaks in preparation for a big code cleanup