refs #9194. Cleanup, document and speedups.