Stricter checking of things which should be on a line by themselves