Fixes old alias syntax and the terrible catch syntax