Removed some micro-optimizations in favor of simpler code. All specs pass again.