Some suggestions from @ralphbean.