Make JS smaller, and actually correct.