Hopefully improving performance without causing bugs.