Bug 859372 - Factor out common actor definitions; r=past