Added in something to deal with static equals sections which don't just call names