Progress on cleaning up cummerbund example.