Fixes to make actions behave better. Made top-level actions more
explicit.