Addressed nits from http://codereview.adblockplus.org/5843385483001856/