Make symbols for which signals are calculated optional