Continuing the development of vertical scaling, from step 15 (remove temporary actions) to step 18 (guard computation). Part of #410.