Now ignoring unmarked main entries. Cleaned up a bit.