Reduce regex calls in Actor acquisition
Lightly sprinkle 'final' around for sanity