Basic activity-alias support.

We have a few mistakenly failing tests that this patch can fix. Please take a look. Thank you.
Ha, I didn't notice (and I didn't use IDE so no auto-fix happened, unfortunately...).