Additions to Verilator support

Pull request re-issued with shorter commit message.