Micro-optimization: removed redundant fat-arrows in several places