Fix declarations in forward.v