various proposal cleanups