Experimental site-alias support.
Simplified site-alias marker logic.