Address some feedback from @prophile and @peterjclaw