Rationalised Carton; removed flymake-cursor.