Fixes to completion, sanitation of trail elements (completion overhangs).