Cyclone: group some often used handlers + minor optimization.