1 13 cleanup

Very tricky.  I think I missed part of the change that makes this work.

This (or the other part I missed, including 'alias_block') fixes the other alias case, right?