A bit of a stretch dependency-wise, but pragmatic. Maybe inject Bundle in directly? ...IDK, this is very minor.