Minor optimization in Stage Listener