simplify action handling in rc.common (#5558)