Less closures around selecting options, slight performance optimizations.