Some more catkin_lint'ing