Better -Werror,-Wunused-function workaround

...superseding 9de4f3b3fd7843f27ea69788b6e37c5022ac2ad3
"-Werror,-Wunused-function, plus additional clean-up and fixes."

Change-Id: I014ca289601a8195fb297ce335b3a52993284e8f