Aka: Add some redundant constraints, just in case.
Aka: Add lock support.
Aka: Remove test that tested a Alias feature that won't be implemented in Aka.