[#189] Some semantic amendments