Tweaks to the restrict_to methods.