Tidy up a bit.
Support both talk and act.