Simplified some Linq & added a few 'const'.