Updated based on feedback from @modocache.