Refs #9984 Cleanup and small fixes.