Reverted $alias parameter requirement, fixed annotations

See #34