Symbol database: more function/variable cleanup. Ticket: #4494