Improved OverrideHandler.__call__().

Override handler now works with rests.