A few small modernizations as well ( override ) Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>