More attempted flump performance improvements.