Not a big deal, but while we're in here, we should probably convert this to 1.9 hash syntax.