Early check-in of changes to support aliasing before attempting to bring
the aliasing code over from the 'bundlers' project.