Cleaned up the action definitions in Companion.