Better outline handling.