native-wayland: code cleanup