Minor changes to #4.