Minor cleanup on action factory spike