Correctly complete alias-qualified vars
Roll out custom split to handle splits at prefix' end