Fix some issues with constraint handling

The first problem is that we weren't processing constraints for some
files.  However this then exposes the issue that we couldn't parse a
+build line followed by a blank comment line.