Move empty collection hack (See #15) from service to listener
Because PHP 5.4 is stupid.  That is all.