Clean up the dynamic summer code a bit